Skip to content

peter/20260524_add_chicken_katsu_recipe#395

Merged
evanugarte merged 4 commits into
SCE-Development:mainfrom
petermle:add_chicken_katsu_recipe
May 27, 2026
Merged

peter/20260524_add_chicken_katsu_recipe#395
evanugarte merged 4 commits into
SCE-Development:mainfrom
petermle:add_chicken_katsu_recipe

Conversation

@petermle
Copy link
Copy Markdown
Contributor

image

@petermle petermle closed this May 25, 2026
@petermle petermle reopened this May 25, 2026
@petermle petermle changed the title Added chicken katsu recipe page and link to page in index.html peter/20260524_add_chicken_katsu_recipe May 25, 2026
@petermle
Copy link
Copy Markdown
Contributor Author

@evanugarte please review!

@evanugarte
Copy link
Copy Markdown
Contributor

this pr is adding 8 files, when it really should just be a new html file and the corresponding line in index.html

see the below youtube video on the sce youtube page for how to check the pr's "files changed" tab

if its not clear how to delete the random files, check this other sce video on how to "start over" on a pr

@petermle
Copy link
Copy Markdown
Contributor Author

done!

@evanugarte
Copy link
Copy Markdown
Contributor

evanugarte commented May 26, 2026

theres still a merge conflict, visible at the bottom of the page of this pr, we have 2 ways to get around it

  • try to fix it in the browser
  • try the second youtube tutorial to undo this

if you follow the video, be sure to pull changes from the main branch of the sce repo, which is different from the main branch of your fork

@petermle
Copy link
Copy Markdown
Contributor Author

yep, should be free of merge conflicts now!

@evanugarte
Copy link
Copy Markdown
Contributor

i likely messed your pr up, i merged another, how did you fix the conflicts, was it through the browser?

@petermle
Copy link
Copy Markdown
Contributor Author

yes, through browser!

i got rid of the merge conflicts through browser again if that helps. let me know if i need to do anything differently!

@evanugarte
Copy link
Copy Markdown
Contributor

winner

@evanugarte evanugarte merged commit 7073c89 into SCE-Development:main May 27, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants